From: Florian Müllner <fmuellner@gnome.org>
Date: Thu, 17 May 2012 13:47:32 +0000 (+0200)
Subject: main: Remove _initUserSession()
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~6557
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=f6a2c92bfa8a1e77855d809ddc2e947764bd747f;p=gnome-shell.git

main: Remove _initUserSession()

In Shell.SessionType.USER mode, two separate setup functions were
used during startup. With the new feature-based checks, the second
one is now almost empty, so move its remaining code into the first
function and remove it.

https://bugzilla.gnome.org/show_bug.cgi?id=676156
---

diff --git a/js/ui/main.js b/js/ui/main.js
index f4150c52a..21d7bc5c8 100644
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -85,6 +85,8 @@ function _createUserSession() {
     automountManager = new AutomountManager.AutomountManager();
     autorunManager = new AutorunManager.AutorunManager();
     networkAgent = new NetworkAgent.NetworkAgent();
+
+    _initRecorder();
 }
 
 function _createGDMSession() {
@@ -131,10 +133,6 @@ function _initRecorder() {
     });
 }
 
-function _initUserSession() {
-    _initRecorder();
-}
-
 function start() {
     // These are here so we don't break compatibility.
     global.logError = window.log;
@@ -217,9 +215,6 @@ function start() {
     keyboard.init();
     overview.init();
 
-    if (sessionMode.sessionType == Shell.SessionType.USER)
-        _initUserSession();
-
     if (sessionMode.hasWorkspaces)
         global.screen.override_workspace_layout(Meta.ScreenCorner.TOPLEFT,
                                                 false, -1, 1);